Patch from George Lebl to fix division by zero for full scroll bars.

Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkrange.c: Patch from George Lebl to
	fix division by zero for full scroll bars. (#62114)

diff --git a/ChangeLog b/ChangeLog
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 295e2b717467f22fe4b0cc63a6b1be81024c5b65..4444bffbb1bb265ac4125fa6ec03fab0d52dba2b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Nov  1 20:09:31 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrange.c: Patch from George Lebl to 
+       fix division by zero for full scroll bars. (#62114)
+
 Thu Nov  1 19:56:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkmain.c (gtk_main_do_event): ref/unref

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 6e63141ea642a99f7b78022b0a645d0f29d077db..a453086ecffdf7d4f3cf006770511ad54373dac5 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1958,8 +1958,9 @@ gtk_range_calc_layout (GtkRange *range,
         
         y = top;
         
-        y += (bottom - top - height) * ((adjustment_value - range->adjustment->lower) /
-                                        (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size));
+       if (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size != 0)
+               y += (bottom - top - height) * ((adjustment_value - range->adjustment->lower) /
+                                               (range->adjustment->upper - range->adjustment->lower - range->adjustment->page_size));
         
         y = CLAMP (y, top, bottom);